diff --git a/linaro_swr.mk b/linaro_swr.mk
index 5530e4f..2a31395 100644
--- a/linaro_swr.mk
+++ b/linaro_swr.mk
@@ -1,13 +1,14 @@
 $(call inherit-product, device/linaro/dragonboard/full.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
-$(call inherit-product, device/linaro/dragonboard/shared/graphics/drm_hwcomposer/device.mk)
-$(call inherit-product, device/linaro/dragonboard/shared/graphics/minigbm_msm/device.mk)
-$(call inherit-product, device/linaro/dragonboard/shared/graphics/swangle/device.mk)
-$(call inherit-product, device/linaro/dragonboard/linaro_swr/device.mk)
 
 # Target is using software rendering
 TARGET_USES_SWR := true
+$(call inherit-product, device/linaro/dragonboard/shared/graphics/drm_hwcomposer/device.mk)
+$(call inherit-product, device/linaro/dragonboard/shared/graphics/minigbm_msm/device.mk)
+$(call inherit-product, device/linaro/dragonboard/shared/graphics/swangle/device.mk)
+
+$(call inherit-product, device/linaro/dragonboard/linaro_swr/device.mk)
 
 # Product overrides
 PRODUCT_NAME := linaro_swr
diff --git a/linaro_swr/device.mk b/linaro_swr/device.mk
index 829d02a..8219bfb 100644
--- a/linaro_swr/device.mk
+++ b/linaro_swr/device.mk
@@ -55,9 +55,6 @@
     ro.soc.manufacturer=Generic Qcom arm64 arch \
     ro.soc.model=linaro_swr
 
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.minigbm.debug=nocompression
-
 PRODUCT_SOONG_NAMESPACES += \
     vendor/linaro/db845c/$(EXPECTED_LINARO_VENDOR_VERSION) \
     vendor/linaro/rb5/$(EXPECTED_LINARO_VENDOR_VERSION)
diff --git a/shared/graphics/minigbm_msm/device.mk b/shared/graphics/minigbm_msm/device.mk
index fcdb6a0..b7c1caa 100644
--- a/shared/graphics/minigbm_msm/device.mk
+++ b/shared/graphics/minigbm_msm/device.mk
@@ -21,3 +21,8 @@
 
 PRODUCT_PROPERTY_OVERRIDES := \
     ro.hardware.gralloc=minigbm_msm
+
+ifeq ($(TARGET_USES_SWR), true)
+PRODUCT_VENDOR_PROPERTIES := \
+    vendor.minigbm.debug=nocompression
+endif